f961de8a900cdbf5c1d10b898fe581e4d8263a5a,maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/javadoc/AbstractJavadocMojo.java,AbstractJavadocMojo,getJavadocPath,#,1805
Before Change
}
else
{
javadocExe = new File( SystemUtils.getJavaHome() + "/../bin", javadocCommand );
}
getLog().debug( "Javadoc executable=[" + javadocExe.getAbsolutePath() + "]" );
After Change
}
else
{
javadocExe = new File( SystemUtils.getJavaHome() + File.separator + ".." + File.separator + "bin",
javadocCommand );
}
// ----------------------------------------------------------------------
// Try to find javadocExe from JAVA_HOME environment variable
// ----------------------------------------------------------------------
if ( !javadocExe.exists() || !javadocExe.isFile() )
{
Properties env = CommandLineUtils.getSystemEnvVars();
String javaHome = env.getProperty( "JAVA_HOME" );
if ( StringUtils.isEmpty( javaHome ) )
{
throw new IOException( "The environment variable JAVA_HOME is not correctly set." );
}
if ( ( !new File( javaHome ).exists() ) || ( !new File( javaHome ).isDirectory() ) )
{
throw new IOException( "The environment variable JAVA_HOME=" + javaHome + " doesn't exist or is "
+ "not a valid directory." );